From a1b2027c865a85952b82d1a3a6dc3528986ddab0 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 20 Jun 2008 12:18:10 +0100
Subject: [PATCH] Compilation fix for x86_64 caused by 17880:d3a87899985d.
 Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com>

---
 tools/libxc/xc_ptrace.c | 4 ++--
 tools/xentrace/xenctx.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index b2f3e55a0c..09d5c656d5 100644
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -264,12 +264,12 @@ map_domain_va_64(
     uint64_t *l4, *l3, *l2, *l1;
     static void *v[MAX_VIRT_CPUS];
 
-    if ((ctxt[cpu].ctrlreg[4] & 0x20) == 0 ) /* legacy ia32 mode */
+    if ((ctxt[cpu].c.ctrlreg[4] & 0x20) == 0 ) /* legacy ia32 mode */
         return map_domain_va_32(xc_handle, cpu, guest_va, perm);
 
     l4 = xc_map_foreign_range(
         xc_handle, current_domid, PAGE_SIZE, PROT_READ,
-        xen_cr3_to_pfn(ctxt[cpu].ctrlreg[3]));
+        xen_cr3_to_pfn(ctxt[cpu].c.ctrlreg[3]));
     if ( l4 == NULL )
         return NULL;
 
diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c
index e6d10db356..a6f80a4ba4 100644
--- a/tools/xentrace/xenctx.c
+++ b/tools/xentrace/xenctx.c
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <getopt.h>
-#include <xen/foreign/x86_64.h>
-#include <xen/foreign/x86_32.h>
 
 #include "xenctrl.h"
 
-- 
2.30.2